From 3858c5282c53931cfe9321d73d513eca6081fd72 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 2 Feb 2023 08:28:13 +0100 Subject: [PATCH] Deprecate GtkAssistant It is a dialog-like toplevel, and libadwaita has replacement parts (like AdwCarousel). --- demos/gtk-demo/assistant.c | 2 ++ demos/print-editor/print-editor.c | 2 ++ gtk/{ => deprecated}/gtkassistant.c | 2 ++ gtk/{ => deprecated}/gtkassistant.h | 50 ++++++++++++++--------------- gtk/deprecated/meson.build | 2 ++ gtk/gtk.h | 2 +- gtk/meson.build | 2 -- 7 files changed, 34 insertions(+), 28 deletions(-) rename gtk/{ => deprecated}/gtkassistant.c (99%) rename gtk/{ => deprecated}/gtkassistant.h (93%) diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c index 6c1561c4e4..322cd5c944 100644 --- a/demos/gtk-demo/assistant.c +++ b/demos/gtk-demo/assistant.c @@ -7,6 +7,8 @@ #include +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + static GtkWidget *progress_bar = NULL; static gboolean diff --git a/demos/print-editor/print-editor.c b/demos/print-editor/print-editor.c index bf45b6945d..ceefdd784b 100644 --- a/demos/print-editor/print-editor.c +++ b/demos/print-editor/print-editor.c @@ -6,6 +6,8 @@ #include "demo_conf.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + static GtkWidget *main_window; static GFile *filename = NULL; static GtkPageSetup *page_setup = NULL; diff --git a/gtk/gtkassistant.c b/gtk/deprecated/gtkassistant.c similarity index 99% rename from gtk/gtkassistant.c rename to gtk/deprecated/gtkassistant.c index 21919eb55b..0a96ed1931 100644 --- a/gtk/gtkassistant.c +++ b/gtk/deprecated/gtkassistant.c @@ -88,6 +88,8 @@ #include "gtkstack.h" #include "gtktypebuiltins.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + typedef struct _GtkAssistantPageClass GtkAssistantPageClass; struct _GtkAssistantPage diff --git a/gtk/gtkassistant.h b/gtk/deprecated/gtkassistant.h similarity index 93% rename from gtk/gtkassistant.h rename to gtk/deprecated/gtkassistant.h index 18abf61330..03030cb43b 100644 --- a/gtk/gtkassistant.h +++ b/gtk/deprecated/gtkassistant.h @@ -103,81 +103,81 @@ GDK_AVAILABLE_IN_ALL GType gtk_assistant_page_get_type (void) G_GNUC_CONST; GDK_AVAILABLE_IN_ALL GType gtk_assistant_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkWidget *gtk_assistant_new (void); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_next_page (GtkAssistant *assistant); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_previous_page (GtkAssistant *assistant); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 int gtk_assistant_get_current_page (GtkAssistant *assistant); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_set_current_page (GtkAssistant *assistant, int page_num); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 int gtk_assistant_get_n_pages (GtkAssistant *assistant); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkWidget *gtk_assistant_get_nth_page (GtkAssistant *assistant, int page_num); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 int gtk_assistant_prepend_page (GtkAssistant *assistant, GtkWidget *page); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 int gtk_assistant_append_page (GtkAssistant *assistant, GtkWidget *page); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 int gtk_assistant_insert_page (GtkAssistant *assistant, GtkWidget *page, int position); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_remove_page (GtkAssistant *assistant, int page_num); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_set_forward_page_func (GtkAssistant *assistant, GtkAssistantPageFunc page_func, gpointer data, GDestroyNotify destroy); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_set_page_type (GtkAssistant *assistant, GtkWidget *page, GtkAssistantPageType type); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkAssistantPageType gtk_assistant_get_page_type (GtkAssistant *assistant, GtkWidget *page); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_set_page_title (GtkAssistant *assistant, GtkWidget *page, const char *title); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 const char * gtk_assistant_get_page_title (GtkAssistant *assistant, GtkWidget *page); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_set_page_complete (GtkAssistant *assistant, GtkWidget *page, gboolean complete); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 gboolean gtk_assistant_get_page_complete (GtkAssistant *assistant, GtkWidget *page); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_add_action_widget (GtkAssistant *assistant, GtkWidget *child); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_remove_action_widget (GtkAssistant *assistant, GtkWidget *child); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_update_buttons_state (GtkAssistant *assistant); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_assistant_commit (GtkAssistant *assistant); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkAssistantPage * gtk_assistant_get_page (GtkAssistant *assistant, GtkWidget *child); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkWidget * gtk_assistant_page_get_child (GtkAssistantPage *page); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GListModel * gtk_assistant_get_pages (GtkAssistant *assistant); G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAssistant, g_object_unref) diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build index 1e7c5c14f8..608ee6031c 100644 --- a/gtk/deprecated/meson.build +++ b/gtk/deprecated/meson.build @@ -3,6 +3,7 @@ gtk_deprecated_sources = [ 'deprecated/gtkappchooserbutton.c', 'deprecated/gtkappchooserdialog.c', 'deprecated/gtkappchooserwidget.c', + 'deprecated/gtkassistant.c', 'deprecated/gtkcellarea.c', 'deprecated/gtkcellareabox.c', 'deprecated/gtkcellareacontext.c', @@ -55,6 +56,7 @@ gtk_deprecated_headers = [ 'deprecated/gtkappchooserbutton.h', 'deprecated/gtkappchooserdialog.h', 'deprecated/gtkappchooserwidget.h', + 'deprecated/gtkassistant.h', 'deprecated/gtkcellarea.h', 'deprecated/gtkcellareabox.h', 'deprecated/gtkcellareacontext.h', diff --git a/gtk/gtk.h b/gtk/gtk.h index 91215e6de0..b46c3d05f4 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/gtk/meson.build b/gtk/meson.build index 322909a947..22fe7fb816 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -163,7 +163,6 @@ gtk_public_sources = files([ 'gtkapplication.c', 'gtkapplicationwindow.c', 'gtkaspectframe.c', - 'gtkassistant.c', 'gtkatcontext.c', 'gtkbinlayout.c', 'gtkbitset.c', @@ -420,7 +419,6 @@ gtk_public_headers = files([ 'gtkapplication.h', 'gtkapplicationwindow.h', 'gtkaspectframe.h', - 'gtkassistant.h', 'gtkatcontext.h', 'gtkbinlayout.h', 'gtkbitset.h', -- 2.30.2